merge trunk
authorK. Handa <handa@gnu.org>
Sun, 22 Sep 2013 12:32:08 +0000 (21:32 +0900)
committerK. Handa <handa@gnu.org>
Sun, 22 Sep 2013 12:32:08 +0000 (21:32 +0900)

Trivial merge